From: Eli Zaretskii Date: Sat, 23 Jun 2007 09:51:18 +0000 (+0000) Subject: (insert-directory): Don't treat FILE as a wildcard if FILE exists as X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~534^2~3^2~2335 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=72e203dd61a6361eb840cda3b5b1ac7cd05c091c;p=emacs.git (insert-directory): Don't treat FILE as a wildcard if FILE exists as a directory. --- diff --git a/lisp/ls-lisp.el b/lisp/ls-lisp.el index 94c8004ff5e..5d6d68e3271 100644 --- a/lisp/ls-lisp.el +++ b/lisp/ls-lisp.el @@ -229,7 +229,10 @@ that work are: A a c i r S s t u U X g G B C R and F partly." ;; `ls' don't mind, we certainly do, because it makes us think ;; there is no wildcard, only a directory name. (if (and ls-lisp-support-shell-wildcards - (string-match "[[?*]" file)) + (string-match "[[?*]" file) + ;; Prefer an existing directory to wildcards, like + ;; dired-noselect does. + (not (file-directory-p file))) (progn (or (not (eq (aref file (1- (length file))) ?/)) (setq file (substring file 0 (1- (length file)))))